Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 20 Nov 2006 12:05:25 +0000 (12:05 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 20 Nov 2006 12:05:25 +0000 (12:05 +0000)

Trivial merge